[AMDGPU] Provide default value in get intrinsic param type #122448
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Make sure that a default value (nullptr) is returned from `getIntrinsicParamType`, also validate uses of this helper function.
Member
|
@llvm/pr-subscribers-backend-amdgpu Author: Jakub Chlanda (jchlanda) ChangesMake sure that a default value (nullptr) is returned from Full diff: https://github.com/llvm/llvm-project/pull/122448.diff 1 Files Affected:
diff --git a/llvm/lib/Target/AMDGPU/AMDGPULibFunc.cpp b/llvm/lib/Target/AMDGPU/AMDGPULibFunc.cpp
index 264b4d43248c69..09f2cad023e2e0 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPULibFunc.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPULibFunc.cpp
@@ -929,23 +929,38 @@ AMDGPULibFuncBase::Param AMDGPULibFuncBase::Param::getFromTy(Type *Ty,
return P;
}
-static Type* getIntrinsicParamType(
- LLVMContext& C,
- const AMDGPULibFunc::Param& P,
- bool useAddrSpace) {
- Type* T = nullptr;
+static Type *getIntrinsicParamType(LLVMContext &C,
+ const AMDGPULibFunc::Param &P,
+ bool UseAddrSpace) {
+ Type *T = nullptr;
switch (P.ArgType) {
+ default:
+ return nullptr;
case AMDGPULibFunc::U8:
- case AMDGPULibFunc::I8: T = Type::getInt8Ty(C); break;
+ case AMDGPULibFunc::I8:
+ T = Type::getInt8Ty(C);
+ break;
case AMDGPULibFunc::U16:
- case AMDGPULibFunc::I16: T = Type::getInt16Ty(C); break;
+ case AMDGPULibFunc::I16:
+ T = Type::getInt16Ty(C);
+ break;
case AMDGPULibFunc::U32:
- case AMDGPULibFunc::I32: T = Type::getInt32Ty(C); break;
+ case AMDGPULibFunc::I32:
+ T = Type::getInt32Ty(C);
+ break;
case AMDGPULibFunc::U64:
- case AMDGPULibFunc::I64: T = Type::getInt64Ty(C); break;
- case AMDGPULibFunc::F16: T = Type::getHalfTy(C); break;
- case AMDGPULibFunc::F32: T = Type::getFloatTy(C); break;
- case AMDGPULibFunc::F64: T = Type::getDoubleTy(C); break;
+ case AMDGPULibFunc::I64:
+ T = Type::getInt64Ty(C);
+ break;
+ case AMDGPULibFunc::F16:
+ T = Type::getHalfTy(C);
+ break;
+ case AMDGPULibFunc::F32:
+ T = Type::getFloatTy(C);
+ break;
+ case AMDGPULibFunc::F64:
+ T = Type::getDoubleTy(C);
+ break;
case AMDGPULibFunc::IMG1DA:
case AMDGPULibFunc::IMG1DB:
@@ -968,11 +983,11 @@ static Type* getIntrinsicParamType(
case AMDGPULibFunc::DUMMY:
return nullptr;
}
- if (P.VectorSize > 1)
+ if (T && P.VectorSize > 1)
T = FixedVectorType::get(T, P.VectorSize);
if (P.PtrKind != AMDGPULibFunc::BYVALUE)
T = PointerType::get(
- C, useAddrSpace ? ((P.PtrKind & AMDGPULibFunc::ADDR_SPACE) - 1) : 0);
+ C, UseAddrSpace ? ((P.PtrKind & AMDGPULibFunc::ADDR_SPACE) - 1) : 0);
return T;
}
@@ -989,9 +1004,11 @@ FunctionType *AMDGPUMangledLibFunc::getFunctionType(const Module &M) const {
Args.push_back(ParamTy);
}
- return FunctionType::get(
- getIntrinsicParamType(C, getRetType(FuncId, Leads), true),
- Args, false);
+ Type *RetTy = getIntrinsicParamType(C, getRetType(FuncId, Leads), true);
+ if (!RetTy)
+ return nullptr;
+
+ return FunctionType::get(RetTy, Args, false);
}
unsigned AMDGPUMangledLibFunc::getNumArgs() const {
@@ -1080,6 +1097,7 @@ FunctionCallee AMDGPULibFunc::getOrInsertFunction(Module *M,
}
FunctionType *FuncTy = fInfo.getFunctionType(*M);
+ assert(FuncTy);
bool hasPtr = false;
for (FunctionType::param_iterator
|
Contributor
Author
|
This was flagged by a downstream static analysis tool. The diff of |
arsenm
reviewed
Jan 10, 2025
arsenm
approved these changes
Jan 10, 2025
BaiXilin
pushed a commit
to BaiXilin/llvm-project
that referenced
this pull request
Jan 12, 2025
Make sure that a default value (nullptr) is returned from `getIntrinsicParamType`, also validate uses of this helper function.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make sure that a default value (nullptr) is returned from
getIntrinsicParamType, also validate uses of this helper function.